Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Акулагеддон! #385

Merged
merged 9 commits into from
Dec 22, 2024

Conversation

MintRainSS
Copy link

О запросе слияния

Добавлены акулы разных цветов. Добавлены значки акул.

Почему / Баланс

Нужно больше плюшек!

Медиа

Снимок экрана 2024-12-16 212539

Требования

Кардинальные изменения

Чейнджлог

🆑

  • add: Добавлены акулы разных цветов! Добавлены значки акул!

Copy link

github-actions bot commented Dec 21, 2024

RSI Diff Bot; head commit 00759b3 merging into 1600a15
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Starshine/Clothing/Neck/Misc/pins.rsi

State Old New Status
shark-black-pin Added
shark-blue-pin Added
shark-brown-pin Added
shark-burn-pin Added
shark-gold-pin Added
shark-green-pin Added
shark-grey-pin Added
shark-orange-pin Added
shark-pink-pin Added
shark-purple-pin Added
sharkblackpin-equipped-NECK Added
sharkbluepin-equipped-NECK Added
sharkbrownpin-equipped-NECK Added
sharkburnpin-equipped-NECK Added
sharkgoldpin-equipped-NECK Added
sharkgreenpin-equipped-NECK Added
sharkgreypin-equipped-NECK Added
sharkorangepin-equipped-NECK Added
sharkpinkpin-equipped-NECK Added
sharkpurplepin-equipped-NECK Added

Resources/Textures/Starshine/Objects/Fun/sharkplush.rsi

State Old New Status
black-inhand-left Added
black-inhand-right Added
black Added
brown-inhand-left Added
brown-inhand-right Added
brown Added
burn-inhand-left Added
burn-inhand-right Added
burn Added
gold-inhand-left Added
gold-inhand-right Added
gold Added
green-inhand-left Added
green-inhand-right Added
green Added
orange-inhand-left Added
orange-inhand-right Added
orange Added
purple-inhand-left Added
purple-inhand-right Added
purple Added

Edit: diff updated after 00759b3

@MilenVolf MilenVolf merged commit f10fc70 into Workbench-Team:arumoon-server Dec 22, 2024
18 checks passed
@MintRainSS MintRainSS deleted the Sharkageddon branch December 22, 2024 18:32
@MintRainSS MintRainSS restored the Sharkageddon branch December 23, 2024 05:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants